feat: Improve urlencoding logic + bug fixes #4338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
the
size:S
mikeldking
reviewed
Aug 23, 2024
| @@ -227,7 +227,7 @@ def __init__(self, *args: Any, **kwargs: Any): | |||
| if bound_args.arguments.get("endpoint") is None: | |||
| _, endpoint = _normalized_endpoint(None) | |||
| bound_args.arguments["endpoint"] = endpoint | |||
| super().__init__(*args, **kwargs) | |||
| super().__init__(**bound_args.arguments) | |||
There was a problem hiding this comment.
not sure I know the difference. lol
There was a problem hiding this comment.
This didnt pipe in the headers if a user set them for our GRPCExporter :(
mikeldking
reviewed
Aug 23, 2024
Comment on lines
+62
to
+74
| name, value = parts | ||
| encoded_header = f"{urllib.parse.quote(name)}={urllib.parse.quote(value)}" | ||
| match = _HEADER_PATTERN.fullmatch(encoded_header.strip()) | ||
| if not match: | ||
| _logger.warning( | ||
| "Header format invalid! Header values in environment variables must be " | ||
| "URL encoded: %s", | ||
| header, | ||
| f"{name}: ****", | ||
| ) | ||
| continue | ||
| _logger.warning( | ||
| f"Header values in environment variables should be URL encoded, ``{header}`` " | ||
| f"was urlencoded to: ``{encoded_header}``" | ||
| "Header values in environment variables should be URL encoded, attempting to " | ||
| "URL encode header: {name}: ****" |
There was a problem hiding this comment.
Not sure I know what's being fixed here. Can you update the description?
mikeldking
approved these changes
Aug 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PHOENIX_CLIENT_HEADERSenvironment variable is not URL encoded, we will attempt to URL encode the header along while also printing a warning message. This PR mangles the header values, in case sensitive information such as authorization tokens are included in them.